bitkeeper revision 1.1108.17.2 (41051ed51JmSlgJg-SSNXffJxH783g)

Change panic() to BUG() in a few places.

diff --git a/linux-2.4.26-xen-sparse/arch/xen/mm/hypervisor.c b/linux-2.4.26-xen-sparse/arch/xen/mm/hypervisor.c
index 6a31649392c8e93dc77fda2a30aa84f42bd0ef24..da4e9ce3ac20975b9025bc23832162d60e3960c3 100644 (file)
--- a/linux-2.4.26-xen-sparse/arch/xen/mm/hypervisor.c
+++ b/linux-2.4.26-xen-sparse/arch/xen/mm/hypervisor.c
@@ -120,7 +120,10 @@ static inline void __flush_page_update_queue(void)
     idx = 0;
     wmb(); /* Make sure index is cleared first to avoid double updates. */
     if ( unlikely(HYPERVISOR_mmu_update(update_queue, _idx, NULL) < 0) )
-        panic("Failed to execute MMU updates");
+    {
+        printk(KERN_ALERT "Failed to execute MMU updates.\n");
+        BUG();
+    }
 }
 
 void _flush_page_update_queue(void)

diff --git a/linux-2.4.26-xen-sparse/include/asm-xen/hypervisor.h b/linux-2.4.26-xen-sparse/include/asm-xen/hypervisor.h
index 18051de97cf2b88084647971e6becc4763a0d1c1..fcafd5429c5d18180365793f4ca556711e24c091 100644 (file)
--- a/linux-2.4.26-xen-sparse/include/asm-xen/hypervisor.h
+++ b/linux-2.4.26-xen-sparse/include/asm-xen/hypervisor.h
@@ -383,9 +383,12 @@ static inline int HYPERVISOR_update_va_mapping(
         "b" (page_nr), "c" ((new_val).pte_low), "d" (flags) : "memory" );
 
     if ( unlikely(ret < 0) )
-        panic("Failed update VA mapping: %08lx, %08lx, %08lx",
-              page_nr, (new_val).pte_low, flags);
-    
+    {
+        printk(KERN_ALERT "Failed update VA mapping: %08lx, %08lx, %08lx\n",
+               page_nr, (new_val).pte_low, flags);
+        BUG();
+    }
+
     return ret;
 }